Merge from emacs-24; up to r111033
authorGlenn Morris <rgm@gnu.org>
Thu, 13 Dec 2012 05:29:15 +0000 (21:29 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 13 Dec 2012 05:29:15 +0000 (21:29 -0800)
commit624bb5813b341f7efba51e9c4c9a53c1ad239fbb
treefe0af5902a86e66a6e2fa2c936cd6554cb2c2fce
parentee6a489eee894ba9cf5c87ee096803fd35d69e48
parent92c12335d252014574c267c3a7333bbc88d13a05
Merge from emacs-24; up to r111033
ChangeLog
Makefile.in
doc/misc/ChangeLog
lisp/ChangeLog
lisp/org/ChangeLog
lisp/org/org-bibtex.el
lisp/progmodes/python.el
src/ChangeLog
src/fileio.c